Auto merge of #3601 - alexcrichton:bump-openssl, r=brson
authorbors <bors@rust-lang.org>
Fri, 27 Jan 2017 01:42:39 +0000 (01:42 +0000)
committerbors <bors@rust-lang.org>
Fri, 27 Jan 2017 01:42:39 +0000 (01:42 +0000)
Update OpenSSL to 1.0.2k

Updates in accordance with the security advisory issued today.


Trivial merge